merge trunk

diff --cc lisp/ChangeLog
index 4d8c08e4e9074f0d6df6f71339f7ae2fa83eabd2,79f68b2a2c722fa502809a9658f76fcc56b14a03..fb84bb64791992161acb31113dc0d7651ccb2dcb
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,19 -1,10 +1,24 @@@
 +2010-11-01  Kenichi Handa  <handa@m17n.org>
 +
 +      * faces.el (glyphless-char): Inherit underline for tty.
 +
 +2010-10-28  Kenichi Handa  <handa@m17n.org>
 +
 +      Implement various display methods for glyphless characters.
 +
 +      * international/characters.el (char-acronym-table): New variable.
 +      (glyphless-char-control): New variable.
 +      (update-glyphless-char-display): New funciton.
 +
 +      * faces.el (glyphless-char): New face.
 +
  2010-11-01  Glenn Morris  <rgm@gnu.org>
  
+       * calendar/holidays.el (general-holidays, oriental-holidays)
+       (local-holidays, other-holidays, hebrew-holidays, christian-holidays)
+       (islamic-holidays, bahai-holidays, solar-holidays): Move aliases before
+       the definitions of their targets.
+ 
        * emacs-lisp/smie.el (smie): New custom group.
        (smie-blink-matching-inners, smie-indent-basic): Add :group.